Merge git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Mon, 18 Sep 2017 14:58:10 +0000 (10:58 -0400)
committerTom Rini <[email protected]>
Mon, 18 Sep 2017 14:58:10 +0000 (10:58 -0400)

Trivial merge